[CI-1628] Use shared secret redacting #885
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tothszabi
force-pushed
the
CI-1628-use-redactwriter
branch
from
9125a56
to
cdc24ee
Compare
lpusok
reviewed
Sep 11, 2023
cli/analytics.go
Outdated
| @@ -49,12 +50,12 @@ func redactStepInputs(environment map[string]string, inputs []models.Environment | |||
| func redactWithSecrets(inputValue string, secrets []string) (string, error) { | |||
| src := bytes.NewReader([]byte(inputValue)) | |||
| dstBuf := new(bytes.Buffer) | |||
| secretFilterDst := filterwriter.New(secrets, dstBuf) | |||
| redactWriterDst := redactwriter.New(secrets, dstBuf, log.NewLogger()) | |||
There was a problem hiding this comment.
Could this "freestanding" log.NewLogger() cause any issues with the structured logging? Can no recall if there are guidelines about it.
There was a problem hiding this comment.
Ahh damn I do not know what I was thinking. Yes, the structured logger needs to be used instead of this one.
This struct requires the logger from the go-utils package but for the structured logging a different one needs to be used. We already had an adapter for this which was used for the analytics. I have made that one public and used it instead.
lpusok
approved these changes
Sep 13, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist
README.mdis updated with the changes (if needed)Version
Requires a MINOR version update
Context
The secret filtering part of the CLI was essentially moved into the go-utils repo with this PR:
bitrise-io/go-utils#181
It was basically a copy-paste action to be able to share the same filtering code between the CLI and the deploy step.
And now this PR removes the unnecessary code from the CLI and replaces with the one can be found in the go-utils package.
Changes